
Fixed so that CTM works with 1.6
